Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add dd-trace to edxapp workers #6

Merged
merged 8 commits into from
May 20, 2024
Merged

feat: add dd-trace to edxapp workers #6

merged 8 commits into from
May 20, 2024

Conversation

connorhaugh
Copy link

Configuration Pull Request

This PR adds dd-trace to the workers so we can monitor them (and celery tasks). It does not require dd to be enabled.

Make sure that the following steps are done before merging:

  • Have a Site Reliability Engineer review the PR if you don't own all of the services impacted.
  • If you are adding any new default values that need to be overridden when this change goes live, update internal repos and add an entry to the top of the CHANGELOG.
  • Performed the appropriate testing.
  • Think about how this change will affect Open edX operators and update the wiki page for the next Open edX release if needed

@connorhaugh connorhaugh requested a review from timmc-edx May 13, 2024 14:58
@connorhaugh connorhaugh requested a review from timmc-edx May 14, 2024 19:34
timmc-edx
timmc-edx reviewed May 14, 2024
View reviewed changes
playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2 Outdated
{% endif %}

{% if EDXAPP_DATADOG_ENABLE %}
{% set executable = edxapp_venv_bin + '/ddtrace-run ' + executable %}
export DD_TAGS=("service:edx-edxapp-{{ SERVICE_VARIANT }}-workers", "queue:{{EDX_REST_API_CLIENT_NAME}}")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. I don't think array syntax will work here. I believe what we want is this:
    Suggested change
    export DD_TAGS=("service:edx-edxapp-{{ SERVICE_VARIANT }}-workers", "queue:{{EDX_REST_API_CLIENT_NAME}}")
    export DD_TAGS="service:edx-edxapp-{{ SERVICE_VARIANT }}-workers,queue:{{EDX_REST_API_CLIENT_NAME}}"
  2. Do we want edx-edxapp-VARIANT-workers, or edx-edxapp-workers-VARIANT? The latter would be a better match for what we have in New Relic.
  3. Rather than introducing a secondary use for EDX_REST_API_CLIENT_NAME can we set an environment variable in the workers.conf like EDXAPP_WORKERS_QUEUE? Otherwise we end up yoking those two features together.

@connorhaugh @timmc-edx
feat: array type
0b0a3d6 
Co-authored-by: Tim McCormack <tmccormack@edx.org>
@connorhaugh connorhaugh merged commit e9b5d83 into master May 20, 2024
4 checks passed
@connorhaugh connorhaugh deleted the feat--add-dd-trace-to-edxapp-workers branch May 20, 2024 13:08
connorhaugh added a commit that referenced this pull request May 20, 2024
@connorhaugh
Revert "feat: add dd-trace to edxapp workers (#6)"
9b6a2c2 
This reverts commit e9b5d83.
@connorhaugh connorhaugh mentioned this pull request May 20, 2024
Merged
connorhaugh added a commit that referenced this pull request May 20, 2024
@connorhaugh
Revert "feat: add dd-trace to edxapp workers (#6)" (#10)
ee5d9a3 
Caused AnsibleUndefinedVariable: 'SERVICE_VARIANT' is undefined in edxapp deploy script.
This reverts commit e9b5d83.
timmc-edx added a commit that referenced this pull request Dec 18, 2024
@timmc-edx
feat: Paver removal attempt #6
e6c8f66 
This reverts the revert ce176c4 from #140 so I can add a fix on top of
it.
dianakhuang added a commit that referenced this pull request Dec 19, 2024
@dianakhuang
Merge pull request #143 from edx/timmc/paver6
6981305 
Attempt #6 at removing paver
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timmc-edx timmc-edx timmc-edx approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@connorhaugh @timmc-edx